bitkeeper revision 1.1239 (421f601b3l9t6npsJbZzplqj6RuWIQ)

Merge wyvis.research.intel-research.net:/home/irchomes/rneugeba/src/xeno/xeno.bk
into wyvis.research.intel-research.net:/home/irchomes/rneugeba/src/xeno/xen.bench

Signed-off-by: michael.fetterman@cl.cam.ac.uk

diff --cc xen/arch/x86/mm.c
Simple merge

diff --cc xen/arch/x86/x86_32/entry.S
Simple merge

diff --cc xen/common/perfc.c
Simple merge

diff --cc xen/include/xen/perfc_defn.h
Simple merge